60. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-11-23 04:31:24 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

60.1 Files compared

#LocationFileLast Modified
1/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme 4.0.6/app/design/frontend/Smartwave/porto/Magento_Checkout/templates/cart/itemdefault.phtml2021-02-03 03:55:12 +0000
2/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme 4.0.7/app/design/frontend/Smartwave/porto/Magento_Checkout/templates/cart/itemdefault.phtml2023-07-14 02:25:38 +0000

60.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged6238
Changed211
Inserted22
Removed11

60.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

60.4 Active regular expressions

No regular expressions were active.

60.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Copyright © 2015 Magento. All rights reserved. 3  * Copyright © 2015 Magento. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6  6 
7 // @codingStandardsIgnoreFile 7 // @codingStandardsIgnoreFile
8  8 
9 /** @var $block \Magento\Checkout\Block\Cart\Item\Renderer */ 9 /** @var $block \Magento\Checkout\Block\Cart\Item\Renderer */
10  10 
11 $_item = $block->getItem(); 11 $_item = $block->getItem();
12 $product = $_item->getProduct(); 12 $product = $_item->getProduct();
13 $isVisibleProduct = $product->isVisibleInSiteVisibility(); 13 $isVisibleProduct = $product->isVisibleInSiteVisibility();
14 /** @var \Magento\Msrp\Helper\Data $helper */ 14 /** @var \Magento\Msrp\Helper\Data $helper */
15 $helper = $this->helper('Magento\Msrp\Helper\Data'); 15 $helper = $this->helper('Magento\Msrp\Helper\Data');
16 $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinimalPriceLessMsrp($product); 16 $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinimalPriceLessMsrp($product);
17 ?> 17 ?>
18 <tbody class="cart item"> 18 <tbody class="cart item">
19     <tr class="item-info"> 19     <tr class="item-info">
20         <td data-th="<?php echo $block->escapeHtml(__('Item')); ?>" class="col item"> 20         <td data-th="<?php echo $block->escapeHtml(__('Item')); ?>" class="col item">
21             <?php if ($block->hasProductUrl()):?> 21             <?php if ($block->hasProductUrl()):?>
22                 <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>" 22                 <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>"
23                    title="<?php echo $block->escapeHtml($block->getProductName()) ?>" 23                    title="<?php echo $block->escapeHtml($block->getProductName()) ?>"
24                    tabindex="-1" 24                    tabindex="-1"
25                    class="product-item-photo"> 25                    class="product-item-photo">
26             <?php else:?> 26             <?php else:?>
27                 <span class="product-item-photo"> 27                 <span class="product-item-photo">
28             <?php endif;?> 28             <?php endif;?>
29             <?php echo $block->getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml(); ?> 29             <?php echo $block->getImage($block->getProductForThumbnail(), 'cart_page_product_thumbnail')->toHtml(); ?>
30             <?php if ($block->hasProductUrl()):?> 30             <?php if ($block->hasProductUrl()):?>
31                 </a> 31                 </a>
32             <?php else: ?> 32             <?php else: ?>
33                 </span> 33                 </span>
34             <?php endif; ?> 34             <?php endif; ?>
35             <div class="product-item-details"> 35             <div class="product-item-details">
36                 <strong class="product-item-name"> 36                 <strong class="product-item-name">
37                     <?php if ($block->hasProductUrl()):?> 37                     <?php if ($block->hasProductUrl()):?>
38                         <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>"><?php echo $block->escapeHtml($block->getProductName()) ?></a> 38                         <a href="<?php /* @escapeNotVerified */ echo $block->getProductUrl() ?>"><?php echo $block->escapeHtml($block->getProductName()) ?></a>
39                     <?php else: ?> 39                     <?php else: ?>
40                         <?php echo $block->escapeHtml($block->getProductName()) ?> 40                         <?php echo $block->escapeHtml($block->getProductName()) ?>
41                     <?php endif; ?> 41                     <?php endif; ?>
42                 </strong> 42                 </strong>
43                 <?php if ($_options = $block->getOptionList()):?> 43                 <?php if ($_options = $block->getOptionList()):?>
44                     <dl class="item-options"> 44                     <dl class="item-options">
45                         <?php foreach ($_options as $_option) : ?> 45                         <?php foreach ($_options as $_option) : ?>
46                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?> 46                             <?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
47                             <dt><?php echo $block->escapeHtml($_option['label']) ?></dt> 47                             <dt><?php echo $block->escapeHtml($_option['label']) ?></dt>
48                             <dd> 48                             <dd>
49                                 <?php if (isset($_formatedOptionValue['full_view'])): ?> 49                                 <?php if (isset($_formatedOptionValue['full_view'])): ?>
50                                     <?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?> 50                                     <?php /* @escapeNotVerified */ echo $_formatedOptionValue['full_view'] ?>
51                                 <?php else: ?> 51                                 <?php else: ?>
52                                     <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?> 52                                     <?php /* @escapeNotVerified */ echo $_formatedOptionValue['value'] ?>
53                                 <?php endif; ?> 53                                 <?php endif; ?>
54                             </dd> 54                             </dd>
55                         <?php endforeach; ?> 55                         <?php endforeach; ?>
56                     </dl> 56                     </dl>
57                 <?php endif;?> 57                 <?php endif;?>
58                 <?php if ($messages = $block->getMessages()): ?> 58                 <?php if ($messages = $block->getMessages()): ?>
59                     <?php foreach ($messages as $message): ?> 59                     <?php foreach ($messages as $message): ?>
60                         <div class="cart item message <?php /* @escapeNotVerified */ echo $message['type'] ?>"><div><?php echo $block->escapeHtml($message['text']) ?></div></div> 60                         <div class="cart item message <?php /* @escapeNotVerified */ echo $message['type'] ?>"><div><?php echo $block->escapeHtml($message['text']) ?></div></div>
61                     <?php endforeach; ?> 61                     <?php endforeach; ?>
62                 <?php endif; ?> 62                 <?php endif; ?>
63                 <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?> 63                 <?php $addInfoBlock = $block->getProductAdditionalInformationBlock(); ?>
64                 <?php if ($addInfoBlock): ?> 64                 <?php if ($addInfoBlock): ?>
65                     <?php echo $addInfoBlock->setItem($_item)->toHtml() ?> 65                     <?php echo $addInfoBlock->setItem($_item)->toHtml() ?>
66                 <?php endif;?> 66                 <?php endif;?>
67             </div> 67             </div>
68         </td> 68         </td>
69  69 
70         <?php if ($canApplyMsrp): ?> 70         <?php if ($canApplyMsrp): ?>
71             <td class="col msrp" data-th="<?php echo $block->escapeHtml(__('Price')); ?>"> 71             <td class="col msrp" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
72                 <span class="pricing msrp"> 72                 <span class="pricing msrp">
73                     <span class="msrp notice"><?php /* @escapeNotVerified */ echo __('See price before order confirmation.'); ?></span> 73                     <span class="msrp notice"><?php /* @escapeNotVerified */ echo __('See price before order confirmation.'); ?></span>
74                     <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?> 74                     <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
75                     <a href="#" class="action help map" id="<?php /* @escapeNotVerified */ echo($helpLinkId); ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?php /* @escapeNotVerified */ echo $helpLinkId;?>","productName": "<?php /* @escapeNotVerified */ echo $product->getName(); ?>","showAddToCart": false}}'> 75                     <a href="#" class="action help map" id="<?php /* @escapeNotVerified */ echo($helpLinkId); ?>" data-mage-init='{"addToCart":{"helpLinkId": "#<?php /* @escapeNotVerified */ echo $helpLinkId;?>","productName": "<?php /* @escapeNotVerified */ echo $product->getName(); ?>","showAddToCart": false}}'>
76                         <span><?php /* @escapeNotVerified */ echo __("What's this?"); ?></span> 76                         <span><?php /* @escapeNotVerified */ echo __("What's this?"); ?></span>
77                     </a> 77                     </a>
78                 </span> 78                 </span>
79             </td> 79             </td>
80         <?php else: ?> 80         <?php else: ?>
81             <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>"> 81             <td class="col price" data-th="<?php echo $block->escapeHtml(__('Price')); ?>">
82                 <?php echo $block->getUnitPriceHtml($_item); ?> 82                 <?php echo $block->getUnitPriceHtml($_item); ?>
83             </td> 83             </td>
84         <?php endif; ?> 84         <?php endif; ?>
85         <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>"> 85         <td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>">
86             <div class="field qty"> 86             <div class="field qty">
87                 <label class="label" for="cart-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-qty"> 87                 <label class="label" for="cart-<?php /* @escapeNotVerified */ echo $_item->getId() ?>-qty">
88                     <span><?php /* @escapeNotVerified */ echo __('Qty') ?></span> 88                     <span><?php /* @escapeNotVerified */ echo __('Qty') ?></span>
89                 </label> 89                 </label>
90                 <div class="control qty"> 90                 <div class="control qty">
91                     <input id="cart-<?php /* @escapeNotVerified */ echo $
_item->getId()
 ?>-qty"
 91                      <input id="cart-<?= $block->escapeHtmlAttr($_item->getId()) ?>-qty"
92                            name="cart[<?php /* @escapeNotVerified */ echo $
_item->getId()
 ?>][qty]"
 92                             name="cart[<?= $block->escapeHtmlAttr($_item->getId()) ?>][qty]"
93                            data-cart-item-id="<?php /* @escapeNotVerified */ echo $
_item->getSku()
 ?>"
 93                             data-cart-item-id="<?= $block->escapeHtmlAttr($_item->getSku()) ?>"
94                            value="<?php /* @escapeNotVerified */ echo $block->
getQty()
 ?>"
 94                             value="<?= $block->escapeHtmlAttr($block->getQty()) ?>"
95                            type="number" 95                             type="number"
    96                             min="0"
96                            size="4" 97                             size="4"
97                            title="<?php echo $block->escapeHtml(__('Qty')); ?>" 98                             step="any"
    99                             title="<?= $block->escapeHtmlAttr(__('Qty'))
 ?>"
98                            class="input-text qty" 100                             class="input-text qty"
99                            maxlength="12"    
100                            data-validate="{required:true,'validate-greater-than-zero':true}" 101                             data-validate="{required:true,'validate-greater-than-zero':true}"
    102                             data-item-qty="<?= $block->escapeHtmlAttr($block->getQty()) ?>"
101                            data-role="cart-item-qty"/> 103                             data-role="cart-item-qty"/>
102                 </div> 104                 </div>
103                 <div class="qty-changer"> 105                 <div class="qty-changer">
104                     <a href="javascript:void(0)" class="qty-inc"><i class="porto-icon-up-dir"></i></a> 106                     <a href="javascript:void(0)" class="qty-inc"><i class="porto-icon-up-dir"></i></a>
105                     <a href="javascript:void(0)" class="qty-dec"><i class="porto-icon-down-dir"></i></a> 107                     <a href="javascript:void(0)" class="qty-dec"><i class="porto-icon-down-dir"></i></a>
106                 </div> 108                 </div>
107             </div> 109             </div>
108         </td> 110         </td>
109  111 
110         <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal'));?>"> 112         <td class="col subtotal" data-th="<?php echo $block->escapeHtml(__('Subtotal'));?>">
111             <?php if ($canApplyMsrp): ?> 113             <?php if ($canApplyMsrp): ?>
112                 <span class="cart msrp subtotal">--</span> 114                 <span class="cart msrp subtotal">--</span>
113             <?php else: ?> 115             <?php else: ?>
114                 <?php echo $block->getRowTotalHtml($_item); ?> 116                 <?php echo $block->getRowTotalHtml($_item); ?>
115             <?php endif; ?> 117             <?php endif; ?>
116         </td> 118         </td>
117     </tr> 119     </tr>
118     <tr class="item-actions"> 120     <tr class="item-actions">
119         <td colspan="100"> 121         <td colspan="100">
120             <div class="actions-toolbar"> 122             <div class="actions-toolbar">
121                 <?php /* @escapeNotVerified */ echo $block->getActions($_item) ?> 123                 <?php /* @escapeNotVerified */ echo $block->getActions($_item) ?>
122             </div> 124             </div>
123         </td> 125         </td>
124     </tr> 126     </tr>
125 </tbody> 127 </tbody>